s/RESIZEABLE/RESIZABLE/

2001-06-25  Havoc Pennington  <hp@redhat.com>

	* gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c:
	s/RESIZEABLE/RESIZABLE/

	* gtk/gtkwindow.c, gtk/gtkwindow.h: s/resizeable/resizable/

diff --git a/ChangeLog b/ChangeLog
index a91bdb65503eb4ca0d177cc3052d9fb1b493b9f4..160bf460d0ba3f8709dc21545db038cdd97e21ca 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2001-06-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c:
+       s/RESIZEABLE/RESIZABLE/
+
+       * gtk/gtkwindow.c, gtk/gtkwindow.h: s/resizeable/resizable/
+
 2001-06-25  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index a91bdb65503eb4ca0d177cc3052d9fb1b493b9f4..160bf460d0ba3f8709dc21545db038cdd97e21ca 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,10 @@
+2001-06-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c:
+       s/RESIZEABLE/RESIZABLE/
+
+       * gtk/gtkwindow.c, gtk/gtkwindow.h: s/resizeable/resizable/
+
 2001-06-25  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index a91bdb65503eb4ca0d177cc3052d9fb1b493b9f4..160bf460d0ba3f8709dc21545db038cdd97e21ca 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,10 @@
+2001-06-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c:
+       s/RESIZEABLE/RESIZABLE/
+
+       * gtk/gtkwindow.c, gtk/gtkwindow.h: s/resizeable/resizable/
+
 2001-06-25  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index a91bdb65503eb4ca0d177cc3052d9fb1b493b9f4..160bf460d0ba3f8709dc21545db038cdd97e21ca 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,10 @@
+2001-06-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c:
+       s/RESIZEABLE/RESIZABLE/
+
+       * gtk/gtkwindow.c, gtk/gtkwindow.h: s/resizeable/resizable/
+
 2001-06-25  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index a91bdb65503eb4ca0d177cc3052d9fb1b493b9f4..160bf460d0ba3f8709dc21545db038cdd97e21ca 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,10 @@
+2001-06-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c:
+       s/RESIZEABLE/RESIZABLE/
+
+       * gtk/gtkwindow.c, gtk/gtkwindow.h: s/resizeable/resizable/
+
 2001-06-25  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index a91bdb65503eb4ca0d177cc3052d9fb1b493b9f4..160bf460d0ba3f8709dc21545db038cdd97e21ca 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,10 @@
+2001-06-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c:
+       s/RESIZEABLE/RESIZABLE/
+
+       * gtk/gtkwindow.c, gtk/gtkwindow.h: s/resizeable/resizable/
+
 2001-06-25  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index a91bdb65503eb4ca0d177cc3052d9fb1b493b9f4..160bf460d0ba3f8709dc21545db038cdd97e21ca 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,10 @@
+2001-06-25  Havoc Pennington  <hp@redhat.com>
+
+       * gtk/gtktreeviewcolumn.h, gtk/gtktreeviewcolumn.c:
+       s/RESIZEABLE/RESIZABLE/
+
+       * gtk/gtkwindow.c, gtk/gtkwindow.h: s/resizeable/resizable/
+
 2001-06-25  Alexander Larsson  <alexl@redhat.com>
 
        * configure.in:

diff --git a/demos/gtk-demo/pixbufs.c b/demos/gtk-demo/pixbufs.c
index 5ad2774d69c6eb2eddc715e54f3ca505d41ad999..d40c0918c3665dc8ffeb789d7b35341683598e9a 100644 (file)
--- a/demos/gtk-demo/pixbufs.c
+++ b/demos/gtk-demo/pixbufs.c
@@ -217,7 +217,7 @@ do_pixbufs (void)
 
       window = gtk_window_new (GTK_WINDOW_TOPLEVEL);
       gtk_window_set_title (GTK_WINDOW (window), "Pixbufs");
-      gtk_window_set_resizeable (GTK_WINDOW (window), FALSE);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
       gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC (gtk_widget_destroyed), &window);
       gtk_signal_connect (GTK_OBJECT (window), "destroy", GTK_SIGNAL_FUNC (cleanup_callback), NULL);

diff --git a/demos/gtk-demo/sizegroup.c b/demos/gtk-demo/sizegroup.c
index 2bd3022e2b16f585a28d0c32845dabfbacd02e0d..fe87feff50e4bda16e5426acabcfea1d3576106a 100644 (file)
--- a/demos/gtk-demo/sizegroup.c
+++ b/demos/gtk-demo/sizegroup.c
@@ -113,7 +113,7 @@ do_sizegroup (void)
                                            GTK_STOCK_CLOSE,
                                            GTK_RESPONSE_NONE,
                                            NULL);
-      gtk_window_set_resizeable (GTK_WINDOW (window), FALSE);
+      gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
       
       gtk_signal_connect (GTK_OBJECT (window), "response",
                          GTK_SIGNAL_FUNC (gtk_widget_destroy), NULL);

diff --git a/docs/reference/gtk/tmpl/gtk-unused.sgml b/docs/reference/gtk/tmpl/gtk-unused.sgml
index 889137cefe6a9c6191ed35dc7c700e2937397c27..baf0db19bdf0edcdd2a76c26a2a0cca29738ca0f 100644 (file)
--- a/docs/reference/gtk/tmpl/gtk-unused.sgml
+++ b/docs/reference/gtk/tmpl/gtk-unused.sgml
@@ -2180,6 +2180,14 @@ fundamental type.
 @window: 
 @Returns: 
 
+<!-- ##### FUNCTION gtk_window_get_resizeable ##### -->
+<para>
+
+</para>
+
+@window: 
+@Returns: 
+
 <!-- ##### FUNCTION gtk_window_set_decorations_hint ##### -->
 <para>
 
@@ -2196,3 +2204,11 @@ fundamental type.
 @window: 
 @functions: 
 
+<!-- ##### FUNCTION gtk_window_set_resizeable ##### -->
+<para>
+
+</para>
+
+@window: 
+@resizeable: 
+

diff --git a/docs/reference/gtk/tmpl/gtkrc.sgml b/docs/reference/gtk/tmpl/gtkrc.sgml
index 5f8876c8fee61249a82d1631a3ce25b382441a63..82694173c4ecfce1fd5632c89bb6dfc9911e7a47 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkrc.sgml
+++ b/docs/reference/gtk/tmpl/gtkrc.sgml
@@ -495,6 +495,7 @@ This can later be composited together with other
 #GtkRcStyle structures to form a #GtkStyle.
 </para>
 
+@parent_instance: 
 @name: 
 @bg_pixmap_name: 
 @font_desc: 

diff --git a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
index d13ab5ab3ff379a16c9e9473cf7e76bba65ab913..92291010db5908d6ab634a49ab84b6e7354e11e3 100644 (file)
--- a/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
+++ b/docs/reference/gtk/tmpl/gtktreeviewcolumn.sgml
@@ -65,7 +65,7 @@ GtkTreeViewColumn
 
 </para>
 
-@GTK_TREE_VIEW_COLUMN_RESIZEABLE: 
+@GTK_TREE_VIEW_COLUMN_RESIZABLE: 
 @GTK_TREE_VIEW_COLUMN_AUTOSIZE: 
 @GTK_TREE_VIEW_COLUMN_FIXED: 
 

diff --git a/docs/reference/gtk/tmpl/gtkwindow.sgml b/docs/reference/gtk/tmpl/gtkwindow.sgml
index 2f34d9feb6a83bd73895379d86ada8210f1453c6..95be4f3df5c406d9bed57bbb16524b1136473413 100644 (file)
--- a/docs/reference/gtk/tmpl/gtkwindow.sgml
+++ b/docs/reference/gtk/tmpl/gtkwindow.sgml
@@ -128,24 +128,6 @@ the child gets a larger allocation than it requests.
 it's larger
 
 
-<!-- ##### FUNCTION gtk_window_set_resizeable ##### -->
-<para>
-
-</para>
-
-@window: 
-@resizeable: 
-
-
-<!-- ##### FUNCTION gtk_window_get_resizeable ##### -->
-<para>
-
-</para>
-
-@window: 
-@Returns: 
-
-
 <!-- ##### FUNCTION gtk_window_add_accel_group ##### -->
 <para>
 

diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index 2466b9cc8af7008fa0ed4ad16d1c41ef2abd19ab..e7a72268f3feb71de850a2e966ba456c7db06f8b 100644 (file)
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -1034,7 +1034,7 @@ gtk_tree_view_map_buttons (GtkTreeView *tree_view)
          column = list->data;
          if (column->visible == FALSE)
            continue;
-         if (column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE)
+         if (column->column_type == GTK_TREE_VIEW_COLUMN_RESIZABLE)
            {
              gdk_window_raise (column->window);
              gdk_window_show (column->window);
@@ -1591,7 +1591,7 @@ gtk_tree_view_button_press (GtkWidget      *widget,
     {
       column = list->data;
       if (event->window == column->window &&
-         column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE &&
+         column->column_type == GTK_TREE_VIEW_COLUMN_RESIZABLE &&
          column->window)
        {
          gpointer drag_data;

diff --git a/gtk/gtktreeviewcolumn.c b/gtk/gtktreeviewcolumn.c
index 4e71b33f1335c5f1878fa3be62b27e12727ca55d..f490332ac681403992abb3ff8c2ad62d74546acd 100644 (file)
--- a/gtk/gtktreeviewcolumn.c
+++ b/gtk/gtktreeviewcolumn.c
@@ -654,7 +654,7 @@ gtk_tree_view_column_update_button (GtkTreeViewColumn *tree_column)
          gtk_widget_show_now (tree_column->button);
          if (tree_column->window)
            {
-             if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_RESIZEABLE)
+             if (tree_column->column_type == GTK_TREE_VIEW_COLUMN_RESIZABLE)
                {
                  gdk_window_show (tree_column->window);
                  gdk_window_raise (tree_column->window);

diff --git a/gtk/gtktreeviewcolumn.h b/gtk/gtktreeviewcolumn.h
index 8a834888204b39a76af72a430eb7dfb67b402174..5a166d4280b0569d3207035c318e3bd3a406df70 100644 (file)
--- a/gtk/gtktreeviewcolumn.h
+++ b/gtk/gtktreeviewcolumn.h
@@ -38,7 +38,7 @@ extern "C" {
 
 typedef enum
 {
-  GTK_TREE_VIEW_COLUMN_RESIZEABLE,
+  GTK_TREE_VIEW_COLUMN_RESIZABLE,
   GTK_TREE_VIEW_COLUMN_AUTOSIZE,
   GTK_TREE_VIEW_COLUMN_FIXED
 } GtkTreeViewColumnSizing;

diff --git a/gtk/gtkwindow.c b/gtk/gtkwindow.c
index dd6d54ec714b09d92054c8ccfa1eece3969df14f..9339c0e5dec7be532be34245f254907130eef698 100644 (file)
--- a/gtk/gtkwindow.c
+++ b/gtk/gtkwindow.c
@@ -3621,37 +3621,37 @@ gtk_window_unmaximize (GtkWindow *window)
 }
 
 /**
- * gtk_window_set_resizeable:
+ * gtk_window_set_resizable:
  * @window: a #GtkWindow
- * @resizeable: %TRUE if the user can resize this window
+ * @resizable: %TRUE if the user can resize this window
  *
- * Sets whether the user can resize a window. Windows are user resizeable
+ * Sets whether the user can resize a window. Windows are user resizable
  * by default.
  **/
 void
-gtk_window_set_resizeable (GtkWindow *window,
-                          gboolean   resizeable)
+gtk_window_set_resizable (GtkWindow *window,
+                          gboolean   resizable)
 {
   g_return_if_fail (GTK_IS_WINDOW (window));
 
-  gtk_window_set_policy (window, FALSE, resizeable, FALSE);
+  gtk_window_set_policy (window, FALSE, resizable, FALSE);
 }
 
 /**
- * gtk_window_get_resizeable:
+ * gtk_window_get_resizable:
  * @window: a #GtkWindow
  *
- * Gets the value set by gtk_window_set_resizeable().
+ * Gets the value set by gtk_window_set_resizable().
  *
  * Return value: %TRUE if the user can resize the window
  **/
 gboolean
-gtk_window_get_resizeable (GtkWindow *window)
+gtk_window_get_resizable (GtkWindow *window)
 {
   g_return_val_if_fail (GTK_IS_WINDOW (window), FALSE);
 
   /* allow_grow is most likely to indicate the semantic concept we
-   * mean by "resizeable" (and will be a reliable indicator if
+   * mean by "resizable" (and will be a reliable indicator if
    * set_policy() hasn't been called)
    */
   return window->allow_grow;

diff --git a/gtk/gtkwindow.h b/gtk/gtkwindow.h
index 8b7b5c3c02eb4ca106fb079fd6473e5aa49324ca..282909cff783a17020bed43cf77153239cfd4bbf 100644 (file)
--- a/gtk/gtkwindow.h
+++ b/gtk/gtkwindow.h
@@ -175,9 +175,9 @@ void       gtk_window_set_destroy_with_parent  (GtkWindow           *window,
                                                 gboolean             setting);
 gboolean   gtk_window_get_destroy_with_parent  (GtkWindow           *window);
 
-void       gtk_window_set_resizeable           (GtkWindow           *window,
-                                                gboolean             resizeable);
-gboolean   gtk_window_get_resizeable           (GtkWindow           *window);
+void       gtk_window_set_resizable            (GtkWindow           *window,
+                                                gboolean             resizable);
+gboolean   gtk_window_get_resizable            (GtkWindow           *window);
 
 void       gtk_window_set_gravity              (GtkWindow           *window,
                                                 GdkGravity           gravity);

diff --git a/tests/testgtk.c b/tests/testgtk.c
index 53bc477ccdfe17fe2435ff181a575da31de23c6a..00aacddafe4b435f8cbabacf673284653a7ea0b5 100644 (file)
--- a/tests/testgtk.c
+++ b/tests/testgtk.c
@@ -3669,7 +3669,7 @@ create_size_group_window (GtkSizeGroup *master_size_group)
                                        GTK_RESPONSE_NONE,
                                        NULL);
 
-  gtk_window_set_resizeable (GTK_WINDOW (window), FALSE);
+  gtk_window_set_resizable (GTK_WINDOW (window), FALSE);
 
   gtk_signal_connect (GTK_OBJECT (window), "response",
                      GTK_SIGNAL_FUNC (gtk_widget_destroy),

diff --git a/tests/testtreecolumns.c b/tests/testtreecolumns.c
index 5584d07d48ce79a7617cf37b64a3287e601e0c7e..784aedc7916f8d9f6694740725156d8395d1353f 100644 (file)
--- a/tests/testtreecolumns.c
+++ b/tests/testtreecolumns.c
@@ -419,7 +419,7 @@ add_clicked (GtkWidget *button, gpointer data)
   column = gtk_tree_view_column_new_with_attributes (label, cell, "text", 0, NULL);
   g_object_set_data_full (G_OBJECT (column), column_data, label, g_free);
   gtk_tree_view_column_set_reorderable (column, TRUE);
-  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_RESIZEABLE);
+  gtk_tree_view_column_set_sizing (column, GTK_TREE_VIEW_COLUMN_RESIZABLE);
   gtk_list_store_append (GTK_LIST_STORE (left_tree_model), &iter);
   gtk_list_store_set (GTK_LIST_STORE (left_tree_model), &iter, 0, label, 1, column, -1);
   i++;